gh-104527: Add check to not recursively write zipfile #104857
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gabevenberg
reviewed
Jun 25, 2023
Lib/zipfile/__init__.py
Outdated
| @@ -1817,6 +1817,11 @@ def write(self, filename, arcname=None, | |||
| zinfo = ZipInfo.from_file(filename, arcname, | |||
| strict_timestamps=self._strict_timestamps) | |||
|
|
|||
| if isinstance(self.filename, os.PathLike) or isinstance(self.filename, bytes) \ | |||
| or isinstance(self.filename, str): | |||
| if os.path.abspath(filename) == os.path.abspath(self.filename): | |||
There was a problem hiding this comment.
I think we might want to use os.path.resolve() here, to resolve symlinks as well.
There was a problem hiding this comment.
Will make this fix later on today
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Refers to #104527
When writing to a zipfile, I have added a check for ensuring that there is no recursive writing of the open zipfile into that zipfile. I use
os.path.abspathto ensure the file names are exactly the same.